From: Klaus Purer <klaus.purer@gmail.com>
Date: Tue, 3 Apr 2018 20:50:36 +0000 (+0200)
Subject: chore(clippy): Simplify to Path.exists() and remove some more &
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~1^2~95^2~1
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=e8ea433ce25788690cb1781bb8e8437641f1806c;p=cargo.git

chore(clippy): Simplify to Path.exists() and remove some more &
---

diff --git a/src/cargo/ops/cargo_new.rs b/src/cargo/ops/cargo_new.rs
index 2f0e94157..cc2fd73be 100644
--- a/src/cargo/ops/cargo_new.rs
+++ b/src/cargo/ops/cargo_new.rs
@@ -444,37 +444,40 @@ fn mk(config: &Config, opts: &MkOptions) -> CargoResult<()> {
 
     match vcs {
         VersionControl::Git => {
-            if fs::metadata(&path.join(".git")).is_err() {
+            if !path.join(".git").exists() {
                 GitRepo::init(path, config.cwd())?;
             }
-            let ignore = match fs::metadata(&path.join(".gitignore")) {
-                Ok(_) => format!("\n{}", ignore),
-                _ => ignore,
+            let ignore = if path.join(".gitignore").exists() {
+                format!("\n{}", ignore)
+            } else {
+                ignore
             };
             paths::append(&path.join(".gitignore"), ignore.as_bytes())?;
         }
         VersionControl::Hg => {
-            if fs::metadata(&path.join(".hg")).is_err() {
+            if !path.join(".hg").exists() {
                 HgRepo::init(path, config.cwd())?;
             }
-            let hgignore = match fs::metadata(&path.join(".hgignore")) {
-                Ok(_) => format!("\n{}", hgignore),
-                _ => hgignore,
+            let hgignore = if path.join(".hgignore").exists() {
+                format!("\n{}", hgignore)
+            } else {
+                hgignore
             };
             paths::append(&path.join(".hgignore"), hgignore.as_bytes())?;
         }
         VersionControl::Pijul => {
-            if fs::metadata(&path.join(".pijul")).is_err() {
+            if !path.join(".pijul").exists() {
                 PijulRepo::init(path, config.cwd())?;
             }
-            let ignore = match fs::metadata(&path.join(".ignore")) {
-                Ok(_) => format!("\n{}", ignore),
-                _ => ignore,
+            let ignore = if path.join(".ignore").exists() {
+                format!("\n{}", ignore)
+            } else {
+                ignore
             };
             paths::append(&path.join(".ignore"), ignore.as_bytes())?;
         }
         VersionControl::Fossil => {
-            if fs::metadata(&path.join(".fossil")).is_err() {
+            if path.join(".fossil").exists() {
                 FossilRepo::init(path, config.cwd())?;
             }
         }
diff --git a/src/cargo/ops/cargo_rustc/mod.rs b/src/cargo/ops/cargo_rustc/mod.rs
index 5f7569482..7036cdc67 100644
--- a/src/cargo/ops/cargo_rustc/mod.rs
+++ b/src/cargo/ops/cargo_rustc/mod.rs
@@ -603,13 +603,13 @@ fn link_targets<'a, 'cfg>(
                 }
             };
             destinations.push(dst.display().to_string());
-            hardlink_or_copy(&src, &dst)?;
+            hardlink_or_copy(src, dst)?;
             if let Some(ref path) = export_dir {
                 if !path.exists() {
                     fs::create_dir_all(path)?;
                 }
 
-                hardlink_or_copy(&src, &path.join(dst.file_name().unwrap()))?;
+                hardlink_or_copy(src, &path.join(dst.file_name().unwrap()))?;
             }
         }